ci: Update flatpak jobs

The CI infrastructure was changed to run with fewer privileges, so we
need to adapt our Flatpak jobs to compensate.

See: https://mail.gnome.org/archives/desktop-devel-list/2020-February/msg00055.html

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49ff3850bb5dff8ec4c1b1a95acb84996a57946c..5d8aea5315ec72f1f2262d35fe70b37de4cd7cd2 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,6 +116,8 @@ msys2-mingw32:
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: flatpak
   allow_failure: true
+  tags:
+    - flatpak
   artifacts:
     paths:
       - "${APPID}-dev.flatpak"

diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh
index 9b27b6290e1e85f43d1f790369a247fbe0a7ec3d..cbb6c097d1b89e0c156ae4e00e5fa474b679d8d0 100644 (file)
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -8,6 +8,7 @@ builddir=flatpak_app
 repodir=repo
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --stop-at=gtk \
         ${builddir} \
         build-aux/flatpak/${appid}.json
@@ -23,11 +24,12 @@ flatpak build ${builddir} meson \
                 -Dbuild-examples=false \
                 -Dintrospection=false \
                 -Ddemos=true \
-                _build .
+                _flatpak_build
 
-flatpak build ${builddir} ninja -C _build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --finish-only \
         --repo=${repodir} \
         ${builddir} \